From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Dec 2010 17:26:01 +0000 (-0800)
Subject: ChangeLog merge fix.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5399
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3a121df267ce86ac140bd9823877c513b2e2e20d;p=emacs.git

ChangeLog merge fix.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index cf17b8219b6..bc2a0755678 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,7 +2,6 @@
 
 	* schema/schemas.xml: Add DocBook (Bug#7491).
 
-2010-12-13  Ulrich Mueller  <ulm@gentoo.org>
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* refcards/orgcard.tex: Cleanup.